Merge "Fix/suppress bootanimation google-explicit-constructor warnings" am: 50ee220126
am: b737b4fdb3

Change-Id: I6e34a9e6351f06d9015e8f061f6e4eb5d22ef391