Merge "Adding target name to their manifests for Hexagon and Flower" into...
Merge "Adding target name to their manifests for Hexagon and Flower" into rvc-dev am: fdb5bdbf am: 2f3d2820 am: a3dc1799 am: 162c5787
Change-Id: I60d4cf029ec9ba88c5aa2d1feb0822307a1d9921