Replace OD_ACC_STR with __func__. Replace the passed in bit accounting string from OD_ACCOUNTING with the current function name as ACCT_STR in preparation for the migration to CONFIG_ACCOUNTING. Change-Id: Ib9946232b37cacfd88f6ff914b99e91c3d7b650e