Merge "Rename # vndk tag to # llndk" am: 76b3d25ea3
am: baf843bde5

Change-Id: Idd581454d1241607d04c0d36ef8936cae572d4c3