adjust for gapps

Change-Id: I2664a83d65be16d9ad775297d511c72c15e4293b