Merge \\"Fix google-explicit-constructor warnings in libhardware\\" am: 99d2543a12
am: 5aeef066b1

Change-Id: Iadf5d4264d566853f56ef0bd3bdfe9741869110f