Merge "Rename # vndk tag to # llndk" am: 563a73e7f7
am: 2b879c262e

Change-Id: Id92e92e9bb31b0cca89beb2ee61fb9957795dd31