Merge "simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function."