Merge "Merge "ART: Change x86 from modify_ldt to set_thread_data" into nyc-dev am: ff2d53a1 am: edaba57a" into nyc-mr1-dev-plus-aosp