Snap for 7214043 from ba461c67220db7bf1bcc593e8a3ba5b168499433 to r-keystone-qcom-release

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