Snap for 8084978 from d77a141e94604246f961934338c66a643814186c to r-keystone-qcom-release

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