Merge "init.goldfish.rc: Allow running 3.10+ kernels on Goldfish"
am: a652a0995f

Change-Id: Ica4aeba1d8867d4aae834c16eb319958ade0db92