add gapps and hwcomposer_defs.h