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

Change-Id: Ic07a49510c946104f74ad72a830aed9696a2ddd6