Merge "config: Update gapps include file" into r