Snap for 7160059 from 34cd2310fac4b6ec08edfe369d5696d3c7cbfbeb to sc-release

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