Merge "Reverting  CVE-2017-0630" into oc-mr1-dev am: 01e7dd3e17 am: 1393522107 am: a49434e149

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/13998610

Change-Id: I56863ab0c9b49d2dd46bc29f095739d0646ccd47