Merge Android Games SDK into master. am: 7c10f2c02c am: 45c48e4116
am: 364265399d

Change-Id: I1a6ba7148ce4c9eb6922c4df9535a4a4cbf0853f