Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"