Merge "Convert libjnigraphics to Android.bp" am: 006c167544 am: 2fbccabbca am: 1adda8b8b3
am: 4e9adb819a  -s ours

Change-Id: Ie9479958dd2964bc39e926248fe102db7344f9e3