Snap for 6862437 from eaca1db701d4b92cec2337c6a279d8b61e39d734 to sc-d1-release

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