Snap for 7750687 from 9cde36af155c50906d10b60d92eeba6078820259 to r-keystone-qcom-release

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