Merge "Remove unnecessary dependencies on ART internal libraries." am: 0616996614
am: 5f239b684f

Change-Id: I0cfcf30c8be58a8307a87349924d45c0d9970cc8