Merge \"Fix google-explicit-constructor warnings in libnativehelper\"
am: c34fa3d4c9

Change-Id: I23bfad087358395c392f8d68ea07e4afd15ee4a0