Merge 41b0ef217fcc5e37fc879253fd799918631a9dbd on remote branch

Change-Id: Ia9c6b218a6c1c013540e65b8cb7ae5b6f7db03d2
tree: b01c04b523e6a36bd765224d36e3d11e646229fa
  1. Android.bp
  2. switcher4.py