Support for miniinverted and full inverted gapps

Change-Id: Icae984b34054f3027b9eb4eb416a2b9bc781df6e