Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
am: 834be81189

Change-Id: Iec1547cc91bf3cb08a47194e91838eb77b4126d7