Merge "Revise GSI to inherit from aosp_base.mk and telephony.mk" into oc-mr1-dev