Merge "Add dexlayout class filtering"