Merge "Fix OWNERS (change google.com to android.com)"