Snap for 7737214 from 9061703d69260274a1316d43a4b7e4f001859088 to tm-release

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