Merge "Include core library jars in runtime apex."
am: bf36682226

Change-Id: I97d7e5b1275709fb39a571376e9e5fcaec5f94fd