Merge "frameworks/base: Disabled SIGABRT after renaming tracefile name."