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