Merge "vndk-def: Merge SP-NDK into LL-NDK"