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

Change-Id: Ia832e5fb8a49928e28891b7c398368af25717f48