common.mk: sync w/platform2 am: e1f046a67c am: a6f156c2a8 am: 22dbc09717
am: fc1ff1a238

Change-Id: Ic9e5be955dd73f0094737c9ee80afd25ea3d7ad2