[automerger skipped] Merge "Enable VNDK for aosp_arm(64)" am: 50958e2cae
am: 6e06d8821e
-s ours
Change-Id: I3e982d1a21749c2222932479d83847829418e151
This commit is contained in:
commit
dfaccc7f05