Merge "Fix typo - include CBR in AOSP builds"