Merge "Merge "Adding target name to their manifests for Hexagon and Flower"...
Merge "Merge "Adding target name to their manifests for Hexagon and Flower" into rvc-dev am: fdb5bdbf am: 60dcb241" into rvc-d1-dev-plus-aosp am: e5949af6 am: 47185080
Change-Id: I3545a9d182aa89a0113707a4cb001f137e35a89e