Improve Android.mk
Merge pull request #8768 from Dhilan007/v3-33rc

Improve Android.mk