Merge "Fix/suppress core/jni google-explicit-constructor warnings" am: ddeab2c144 am: e053f576b1
am: a13a9ee327

Change-Id: I48005e97647a95843bd0fd14701493717fa798bb