Snap for 6008936 from e6d8bb98e115e6b13c7ee4038f536cde0ed763c1 to r-keystone-qcom-release

Change-Id: I37c2091e82b4f4559c540aab0d1976efefcabc7c
tree: 42aaff17f746a1267e8ba54efbaf640f26317613
  1. Android.bp
  2. switcher4.py