Merge "Convert ril java to HIDL client (patch 2)."