Merge "Move common settings in BoardConfig.mk into a common makefile" into oc-mr1-dev