Snap for 6885502 from 1bcf6d0cfa7f353309c24cb2ebd6b522fca4e94b to sc-d1-release

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