Merge fb4cbb81ea993aa6240c191479df643a7f47868d on remote branch

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