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

Change-Id: I8721f2f3182c0d5a7b1717bde0c840c7e1864a41