Snap for 7160059 from 34cd2310fac4b6ec08edfe369d5696d3c7cbfbeb to sc-d1-release

Change-Id: Ie30129a8884d6241ad22f332dc92167d23df9b46
tree: 973d53e8cf2c9718d9b112b7c7390932e69fc768
  1. Android.bp
  2. switcher4.py