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

Change-Id: Ice5e7dfcf2ac8d58cde7cc5691271e318a45582d