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

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