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

Change-Id: I5b24c98909663a11647353b047c58cb228956403