Snap for 4818534 from 017039edafdfc57b880ac11717b538d43ee0385e to pi-release

Change-Id: I8a39d0b29bd6f3055d316be12f3a6033372f30a8
tree: 05a337d5fcea8f36a487f08593ab8442882282b8
  1. service-t/
  2. tests/
  3. Android.mk