[automerger skipped] Merge "Rename # vndk tag to # llndk" am: 563a73e7f7 am: 2b879c262e
am: 92c8977769 -s ours
am skip reason: change_id Iae2acdf1ff4097a64a5c6280797c66abb1d5a5e6 with SHA1 0e957b82c8 is in history

Change-Id: I781c7f4ffb998a58be14060bc579102a15c9dfcc