Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I0674e13bcf580439c257d1eced1ea2c780327654
tree: 9b1e42693e974a391a565ebe757edd6217a060fd
  1. service-t/
  2. Android.mk