Merge "Revert "Include core library jars in runtime apex.""
am: 9fc9cf373b

Change-Id: If0bb3432a853afa372702c792273ddd946a7a32e