Merge "Convert giflib to Android.bp" am: c549daef5e
am: 34bd52e5be

Change-Id: Ie0d542fd6a48be04644a443e2e3221f3a75cd2b3