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

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