Merge "Remove android_logmsg and trace_api"