Merge "Adding target name to their manifests for Hexagon and Flower" into rvc-dev am: fdb5bdbf12 am: 2f3d2820cb am: a3dc1799d1 am: 162c578772

Change-Id: I60d4cf029ec9ba88c5aa2d1feb0822307a1d9921