Revert "android master"

This reverts commit 78b61b4c1debbc9e032484c020cc73b8913bb0df.