Merge "Fix handling of .o files in LOCAL_GENERATED_SOURCES." into klp-dev