Merge "Fix custom unofficial build tags" into cm-11.0