Merge "Add LLNDK support for the VNDK" am: 2d6e79d268
am: 67eb8bb766

Change-Id: I77343282f1e7d23677950a037754d30dfa5d7cc6