Merge "Remove bcc from generic_no_telephony.mk."