Consolidate blob extractors

Change-Id: Ic62960835acd2fe53c34a2f1d5897110e3e99da3
Merge "Consolidate blob extractors" into cm-10.1