Merge 78c87ff099e9dfec14fa5194a66b74cc144853b7 on remote branch

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