Merge "Convert libjnigraphics to Android.bp" am: 006c167544
am: 2fbccabbca

Change-Id: I7fea93c95baee3812fdf48805bb883e3afd172c1