Merge "Special case dex files that have hidden API data."
am: 1923176c8e

Change-Id: I7943d33ca1e6e313bc8e67238373d92d51c91e41