Merge \"Disable the CC collector / read barrier checks in non-debug build.\"
am: aacb0aa311

Change-Id: Id8a89b0716cbae92c7c7925773c2e55b038f1bdd