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

Change-Id: I062c199c41bb80d82a358106afa20497ea857fc3