Merge "Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am: 834be811 am: 8476a2c7 am: c77b8466"