Merge "Fix OWNERS (change google.com to android.com)"
am: 7a8e363c0b

Change-Id: Ic3e8861a95ac025d1ff6f68943ef460b94d3c501