Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev