Merge "Only enable asserts on userdebug/eng builds." into nyc-dev
am: 9d9a55b

* commit '9d9a55be9d04b478266c597c56ffeae5d1de1a62':
  Only enable asserts on userdebug/eng builds.