Merge \\\"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.\\\" am: 82cc1bf01d am: bf66399909
am: f3886d352f

Change-Id: I9f5ff1667b1c38e8e09729ecf14182ad426c030d