[automerger skipped] Merge "Rename # vndk tag to # llndk" am: 76b3d25e am: baf843bd
am: 85261fd2 -s ours
am skip reason: change_id I10d40e06b1f1d6d0e190699ab6356b18d53fd2ab with SHA1 0a0e26b1 is in history
Change-Id: I2bb6787512e808c64c23c527aa25acd5e3106409