Changes needed to make AOSP compatible with G2