Merge remote-tracking branch 'weave/master' into aosp-master
Undo deletion of Android.mk happened on master branch.

Change-Id: I05ba2937cd98755d205e0a777e4f7d13899eb238