Merge "Add LLNDK support for the VNDK"