Merge "ART: Change main-thread thread paging scheme"
am: 222a480d96

Change-Id: I7ebe6a4e6c1a7051660edc5c13c765b18d022ff2