Merge "vndk-def: Remove HL-NDK from code" am: 36be17f025 am: ebc811daac am: 5e17869be9
am: 8225512773

Change-Id: I99ea5e1267f640e431731c75b2547792ebfb1ecb