Merge "Rename # vndk tag to # llndk"