Merge "ART: Don't prepend '/' if classpath_dir is empty"
am: c69f6c310b

Change-Id: I719d3a9e46833ffe1587954ee55055bc7987f20a