Merge "Convert frameworks/opt/calendar to Android.bp"
am: 8cc927f20f

Change-Id: I1c9b9b134fcd8e36ce045a57cfb818bd70ef22d7