common.mk: sync w/platform2
am: e1f046a67c

Change-Id: Id43b782a7c568421e454818df1373536ca0e461b