Merge "CTS test for Android Security CVE-2017-13289" into oc-dev