Merge 'weave/master' into 'weave/aosp-master' and restoring Android.mk

Merged master into aosp-master and put back Android.mk which has been
added to and then deleted from master.

Change-Id: Ie07899c6554f49231a8fd229c7ca06140b9e1a95