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

Change-Id: I212e88f5463db1fcc55e0d99dc0c219e335bc8ed