Snap for 5087486 from b3aa6187062b47f7d1674a549d9615cfae2ede8e to pi-qpr2-release

Change-Id: I5ee774fa258492c202c81f56eb85f019ded154b2
tree: 4d555590de485ad6606dc2e43bddd82cfb91eca1
  1. service-t/
  2. tests/
  3. Android.mk