Merge "removing google specific language from aosp strings"