Snap for 6862355 from 9b7db58cea9122d33af96bb9145cb422e4ec0e3a to sc-release

Change-Id: Ic8829df8b24d2248ae2b1141f5c15be29f41d416
tree: f95263c33a855c69a499c737fe82a0ab9970ddd7
  1. Android.bp
  2. switcher4.py