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

Change-Id: Ic38a5ceab7fc16368201fdd37ddcc302c83607ca