Merge Android Games SDK into master.
am: 7c10f2c02c

Change-Id: I90dfa12458ff20a3adcec98f8ee1fc7c0157f672