Merge "Fix hard-coded path that broke ril on 64 bit builds"