Merge "Don't put android.os.Parcelable in framework.aidl"