Merge "Compile libjavacore and libopenjdk against libandroidicu"