Merge "CTS test for Android Security CVE-2016-3746" into pi-dev