More compatibility for renamed macros...

Change-Id: I53034a2e501115b8da545db6dd705bcdf526ce9b
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2