clean for gapps

Change-Id: I8d597a4c3e48448ed75cf17a06ef1c7490732733