Update AndroidCPG to v1.2

Closed username-removed-72010 requested to merge (removed):master into master

Update AndroidCPG to v1.2