am: 07346e19 * commit '07346e19': Use core-oj alongside core-libart wherever required. Fix for OpenJdk libcore switch