Merge "Convert external/libogg to Android.bp"