m4: Update proprietary blobs list

Change-Id: Ia40f7d61be7a216d4c8b42f20940f180fc3493ca
m4: Update build fingerprint

While we're here, don't override BUILD_ID

Change-Id: Ifa04a7f03faff85be03e1353b337820bee9cb3e9
Merge branch 'cm-11.0' into kk_mkt