Merge "Factor elements common to all ART generic device BoardConfig.mk files." am: e5c490a32f am: 4b7b4f1014

Change-Id: Ic56d7fb3ab2575e4f1b8ca6ade5fe4146233ca74