Merge changes Ia8b00053,I98851ea9 into main

* changes:
  Apply bpfmt to native/graphics/jni/Android.bp
  Add stubs to libjnigraphics