Merge "Add hwcomposer to emulator image build"