[automerger skipped] Merge "[RESTRICT AUTOMERGE]: test for Android Security CVE-2016-2413" into oc-dev am: cadaf1591e am: 2b6046ba79
am: 7e7fa39a70 -s ours
am skip reason: subject contains skip directive

Change-Id: If4119ccca56a0e1dbe4815468cd5f27d8865b9d5