Merge pull request #11086 from dominickuo/bug-893724

Bug 893724 - Adopt all build flags in Android.mk for all subsequent re-builds, r=ochameau(cherry picked from commit 56c6505d680c79a21a5743b447ef64d32db31206)