Merge "Fixing some AIDL warnings." into sc-dev