Merge "Only enable asserts on userdebug/eng builds." into nyc-dev