serrano: Update and sync with new extract script
Merge pull request #530 from arco/cm-11.0

serrano: Update and sync with new extract script
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0