Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"