Merge "Be compatible with new google test" am: f4d63fe402
am: 6cf4478863

Change-Id: I1d3f9c74e61d6199b28f58ce1898cf390b87b9a3