Merge "Tweaks to libdexfile build definitions."
am: bcaee3b2c9

Change-Id: Iae81bdec42e333d84e3c8ba89898d7b5cbca5277