Merge "Add dexlayout class filtering"
am: eaf09d1041

Change-Id: I4ac60e12932f286da1e6023ab1a124c137fa9e7f