Merge "Make Android.mk match downstream version."