Merge "Dexlayout fix for duplicate class data and preserving last code item."
am: ebecb7e183

Change-Id: Iac443a9dc857d05205e50558d2e39c42e46394e6