Back out 0044e4c2dc53 (bug 851149), 3080f18ba53d (bug 698328), 0b147c3f682b (bug 850713) for Android bustage
CLOSED TREE