Merge "Read all product makefiles even when TARGET_BUILD_APPS is set"