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

Change-Id: Iaaafd630ef319d996fce6290f4b2aaf3bcaac29b