Merge "Add a new layer generic_no_telephony.mk"