Merge "cm.mk: don't override BUILD_ID" into cm-11.0
Conflicts:

	cm.mk
props: update adreno blobs

Change-Id: Iaaed9630769ab657c41c398e324d141f09fe4b0e