Moved skia to aosp-s4 manifest