am 6a955d72: am 4c8c35d0: Merge "move goldfish stuffs to device/generic/goldfish" into jb-mr2-dev

* commit '6a955d72ff8b5d4daafe9ce4df6d94d3effa99ea':
  move goldfish stuffs to device/generic/goldfish