[automerger skipped] [RESTRICT AUTOMERGE]: test for Android Security CVE-2016-3913 am: f766d8aef0 am: cd4fee165f am: d115c441a0 -s ours am: 958887e4e2 -s ours
am: ce3549028a

Change-Id: If0b6ac52a3d14939ab94a34dcf790fd907c2480f