Merge "AOSP/Calendar - Android.bp changes"