Merge "Reenable EcdhTest#testModifiedPublic"
am: c890d21669

Change-Id: Ib2f15bc54deb88a068ecff6fd18dd7f5ab5a8236