Bug 1040418 - Correct architecture for Android & B2G; r=camd