Merge Android Games SDK into master.

Bug: 123068679
Change-Id: I4eaab26fa0abcec4a54d01057902f773a26bbf31