Change inherit order

http://review.cyanogenmod.org/#/c/59655/