Merge "Convert framework-protos to Android.bp"
am: d4609af986

Change-Id: I6ebf88a0931b7f9f49ac8044deb46b100129bb9f