Merge "Add Android.mk so that underneath targets can be updated." into nyc-dev