Bug 979438 - Follow-up: Unify android target SDK versions. r=upstream