Fix gapps being moved upon install (1/2)

Change-Id: Idcff1bd9cd8cf8fea007af44e7f45cdc1979f68b