Snap for 4767765 from 073b7977c520e79c3c1dbcad618e0de3921fdda2 to pi-release

Change-Id: I374d7500bd788530d544402409af579ae3befde4
tree: de535f49f870036a4a93399b1e986baee08c8745
  1. service-t/
  2. Android.mk