Backout 385c05262943 for android robocop failures.

--HG--
extra : rebase_source : f315f7b4cd3b998baa4ffb5546bec914409092e9