fix some commit fail

Change-Id: I6a3a3adabc8f2aba7e49c8a8f45fd0d2e850887d
add missing drm blobs

Change-Id: I11112160eb4647773a195a2808bc80f9d784ec12
Merge remote-tracking branch 'cm-12.0/cm-12.0' into cm-12.0