Merge "Refactoring: C++11 style DISABLE_ bionic marcos"