Merge "Diced: Switch to fixed length array AIDL types."