Merge "ART: Introduce thread-current-inl.h" am: eae88fc9f1 am: 4da2e429d0
am: 8055bfa422

Change-Id: I29bbef2f6d58fea3f6cd323a9e578c44341931c9