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

Change-Id: Icd7db9d6a6991f39cf66c6b49f7bcd747891b5e5