Merge "goldfish: add ril"