Merge changes I1f662f82,I59a3b297 into integration

* changes:
  fix(build): include platform mk earlier
  fix(arm): use EL3_PAS in MAP_BL2_TOTAL definition