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

Change-Id: I860d9a0e1d9c96a31b50710e86fd1e41a8b9b631