Snap for 7146909 from 31a58f9adbbeb8a7b96027edaffb7d0ac9e0c8f7 to sc-v2-release

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