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

Change-Id: I193fb32d4d004bb3211934d51b651e06956c8b08