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

Change-Id: I40b9a72b0be6d303422059e7cbe0fbcb61458eda