Merge "Reenable EcdhTest#testModifiedPublic" am: c890d21669
am: 7886b5bd54

Change-Id: I4bb8dc368a66ced9f4e6826600e9762eaa1523f4