Merge "goldfish: add device level mk file" into oc-mr1-dev