Snap for 6916203 from a624f90c0076c3814c7e6602cde80493c5d90273 to mainline-release

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