Merge "vndk-def: Remove HL-NDK from code"