Bug 788022 - Bustage fix for ANDROID define on a CLOSED TREE. r=bustage