Merge "move goldfish stuffs to device/generic/goldfish" into jb-mr2-dev