am 63a4f4b0: Merge commit \'e14ee540d6accf3468367f2a25a4540fd3e08051\' into HEAD

* commit '63a4f4b09717c9b0977191621028dbae0f6aaba8':
tree: 102f6c500d3334af2e45e380fd2babdb39b56f7a
  1. service-t/
  2. Android.mk