Snap for 6862355 from 9b7db58cea9122d33af96bb9145cb422e4ec0e3a to sc-release

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