Merge "Remove use of static libdexfile to avoid linking in ART internal code." into rvc-dev