Merge "Fix memory order and race bugs in Refbase.h & RefBase.cpp am: 70a46d674a am: bc2a2284e4" into nyc-mr1-dev-plus-aosp