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

Change-Id: I66274c418ed6ba0a6fbdf9b6355532c9e9cd36ce