Merge 61ac56588dfff9fdf98e9d70e5e18f51c5413d6b on remote branch

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