Merge "Add gsi_common.mk"
am: 59fa4ca993

Change-Id: I5d329e28b556e55f40817fce04aa4e363c742674