Merge "Merge "Better error reporting for createOrUpdateLayer" into pi-dev am: 67a58660b9" into pi-dev-plus-aosp
am: 0bb7fbe729

Change-Id: I722510bbf527f1dd4eb323bf4be48653eb3562cc