Bug 355063 - bustage followup for Android/Metro. r=sparky