Merge "Rename # vndk tag to # llndk" am: ba07364e94
am: 7172b09ef2

Change-Id: I5bdbbc279332f121038339814ebcf2ed2a3a6eb0