Add Support for Gapps

Change-Id: Id0565a3f4effd830b681bc657e47a0abc35532cb