Snap for 4759746 from b23181bbe9275b315a4c4b448045a9e155fcee79 to pi-release

Change-Id: Id3c6ad8a7955f4d354d59e85acbb08963b508bd9
tree: e5fbf7e1315a12453427c45872f3032f2111a883
  1. service-t/
  2. Android.mk