[automerger skipped] Merge "Add ANGLE.apk to the base system." into rvc-dev...
[automerger skipped] Merge "Add ANGLE.apk to the base system." into rvc-dev am: 9aa8daba am: 3345835c -s ours am: d6062b64 -s ours
am skip reason: Change-Id Ie06dcfccce022ed608c18362e246f6f2a3c6fb1a with SHA-1 6ee4bed4 is in history
Change-Id: I6268a05569d097233ba54bde24804c4c6091f73c