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

Change-Id: Ie6d11cb033f3f44e6a9317e8983a6edcf5f41f28