Fix build after AOSP/master merge; revisit MCC/MNC change later.