Back out 00fc7e525678 (bug 803543) for debug Mac build bustage
CLOSED TREE
Back out 75fb08918611 (bug 903466) for Android build bustage
CLOSED TREE