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

Change-Id: I5182d006d5e75d91379ce919566fd63495a8941a