Backed out changeset 5a952abc6c2f (bug 1035454) for Android debug M4 permafail.

--HG--
extra : rebase_source : 3e27fb16750f0df9bda5d83138bebf5932adc3fd