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

Change-Id: Ide2abcac1aa67165c44461a69326eda7b2c54aef