Backed out changeset e7a6c931bcf5 (bug 927128) for Android packaging bustage.
CLOSED TREE