Merge "Convert framework-protos to Android.bp"