Merge "Changes for ril.h version 6."