Merge "Some minor updates in the libdexfile external API." am: 810c57d610
am: 729f8be991

Change-Id: I3f5dea5f12ce3ffd6debb5f9a9fabacfb8cb9c8f