Merge changes Ifd9fc521,I535b1dff into oc-dev

* changes:
  Fix CtsSecurityTestCases test_cve_2016_2499 fail
  CTS fix test for Android Security CVE-2016-2499