Merge "Frameworks/base: Refactor android.os.Debug" into nyc-dev