Snap for 4620899 from 90110a8d5441cb8074f287fd8f1950e3a37f525f to pi-release

Change-Id: I4ae7d47a17a9552b92b8cead1f4da151653da785
tree: 16e8f4802e5e638359a468213486bfffd18aab3f
  1. service-t/
  2. Android.mk