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

Change-Id: I6e09d6d3d499a820a38e1656defe8f4bac8f7b9f