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

Change-Id: Ib2227034fe47817198f4c2bbae4630aaf7b05413