Merge "Set androidboot.hardware to goldfish for all non DT platforms" into studio-1.3-dev