am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to...
am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev
* commit '8a012b3a':
DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE