Merge "ART: Filter more thread roots" am: 5e2c2894dc
am: a93ccfb3fd

Change-Id: I80d7076b65b28c99cf692554c03f59191b5a77fc