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

Change-Id: I0e31c4a34fb665e8589093161c7ba2836b02e70f