Merge "Add dependency on libdexfile for static libraries."