Merge "[RESTRICT AUTOMERGE]: test for Android Security CVE-2016-2413" into oc-dev
am: cadaf1591e

Change-Id: I64bc58d13dbe8ddefcd8ccd20319b4e9f25f87af