toro: consolidate blobs

Change-Id: I2e2bfaba32147de7fc9c518324bd10e9a048f91d
manta: KOT49H

Change-Id: I4d1655074dcce7d0d49463e4e68de4eff841ad37
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0