Merge "fix possible overflow in effect wrappers." into security-aosp-mnc-mr1-release