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

Change-Id: I1fe1cd99aa3f1b5a132815b029c8d422d8dd2bff