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

Change-Id: I8866d48e6994ce1ce909bc5e1cfb1e59acda05ef