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

Change-Id: I412c5a13e1ed1aee4e919180a74936f7669af321