Merge \'weave/master\' into \'weave/aosp-master\' and restoring Android.mk
am: 2411590b71

* commit '2411590b716d16540e8018dfb4382d4c57812f27':
  Remove Android.mk from the master branch