installer cache + gapps dir

Change-Id: Icd0bc31980ccc1dc67ce86e5c63352ac0c1b9fbf
(cherry picked from commit afb404dcc5a03b028791fba10936c207eb3d2197)