Bug 942167: Enable non-unified android{-debug} builds r=bhearsum