Merge "upstream branch: update Android.mk to N version" into upstream-master