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

Change-Id: Id27ebbdae64400b3e55915dda1cd9186ddd8f1f6