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

Change-Id: Id063c973159364738a7fb6f17a6c8838c4756b9d