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

Change-Id: I005a2a4b02c2c0665e2f3aa84d59c5202a8991cb