bug 979438 - Unify android target SDK versions, follow up to address nits r=nalexander

--HG--
extra : rebase_source : 841e8eece32e10d6d2c3443d5bcbf7ac935dd157