[automerger skipped] Merge "Rename # vndk tag to # llndk" am: ba07364e94 am: 7172b09ef2
am: 2072e8f7c6 -s ours
am skip reason: change_id I7ae77e232ec25cbe7afd98d1b68fc7a7fcf9bdfd with SHA1 a9258ab2e1 is in history

Change-Id: I9729ce0a25dcfbf987545505abfc4e3198e311c0