Merge "Move the NDK graphics wrapper (libjnigraphics) to frameworks/base/native"