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

Change-Id: Ie5089669974c9e9e9c99525c50eddaef6f479874