common.mk: sync w/platform2 am: e1f046a67c
am: a6f156c2a8

Change-Id: I4817f9593e1f6dfb11732ced0d1283bcc648c205