Merge "Fix/suppress renderthread google-explicit-constructor warnings"
am: 138aae8eaf

Change-Id: I8205f774fc3910ee63a60c92d330eaff6f649982