Merge "vendor: enable optional gapps build" into android-10