Merge "ATRACE: Add fastrpc_stat to the memory category"