Summary:
Original commit changeset: 56d1ca1a60ed
This broke Android support in some instances. We haven't had a chance to investigate this yet, but this should cleanly reapply, so we can figure out what happened after the release.
Reviewed By: cekkaewnumchai
Differential Revision: D18688590
fbshipit-source-id: ff84080d43fa481cc8c8c669a76aed15d0f8aa56