Fix gapps being moved upon install (2/2)

Change-Id: I793baad4f8f1cfc9cbe8f9a7aa9366baed771c94