Merge "vndk-def: Merge SP-NDK into LL-NDK" am: 7a56aa9fe7 am: 181f26f63c
am: aca55616a6

Change-Id: I53e9776eba2a302184fc14e964454e84f63bcc1d