Added vendor and Gapps inherits