am 66bbf159: Merge "Refactoring: C++11 style DISABLE_ bionic marcos"

* commit '66bbf1595c0fc25d4bc47457d8020b11e135996d':
  Refactoring: C++11 style DISABLE_ bionic marcos