Snap for 5947509 from a2b8e27928d6784733d6642763c186094e86174a to r-keystone-qcom-release

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