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

Change-Id: Ie9718c64fe9b68505a2e3e31b4c7362ce0312148