Use Makefile variables to specify margin settings. am: 855eaffff6  -s ours
am: 989385200f

Change-Id: I0bec043db9e23cb7c47ed2929b906e42561eacef