am 007c7de4: Merge commit \'f4740f2d370b6458126942156245b2d39ec223f9\' into HEAD

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