fusion3: Mass consolidation

* Deduplicate all teh things!

Change-Id: I973316424b299316b0490108ae2d42fcdd94566f
Merge remote-tracking branch 'cm/cm-11.0' into HEAD