Merge "ART: Tentative fix for stack count issue in test 913" am: 8af5efdb1d am: fb449e46d6 am: cd873c16bf
am: 69b1a6fdb8

Change-Id: Ic711ded984a3fbe6c74876a70e99dbcadfbcffbe