HalManifests can be merged.
am: 4c6962d953

Change-Id: I5315a62308054ef9f544b364f3d7176cc183e4a5