Merge remote-tracking branch 'origin/cm-12.0-ril' into cm-12.0

(cherry picked from commit f2c88a12add8271ce6ab9a0caa2eadb4382a6082)
ril.h: add ifdef for legacy_ril

(cherry picked from commit d9915ae023c8271e50f7d8349e2b679ae06b6a22)