Merge "ART: Clean up unused using declarations" am: 6514f95435 am: 6b5a1e0065
am: 306f06d658

Change-Id: I85a87a5dadabd8e75d9e183d955b5aa44bb0f54f