Merge "Remove dependency on libdexfile internal header."
am: 1c4ad71dff

Change-Id: If6d9da56b2212bd0b32be345d32641bac15d51eb