Merge \\"ART: Workaround for ARM valgrind stack issues\\" am: 8807794592
am: 65c929e21d

Change-Id: Ie7d7ab287b05cc77b03c82ed7281075d9c9e00c2