made some changes for gapps

Change-Id: I286250920a193e28a957f0791ae510066946e8d8