Merge "Rename # vndk tag to # llndk" am: 29d7ade158
am: 1a7391fbb8

Change-Id: I88a0f6311ac6e4478bdc29061c3a11e079194c94