Merge "Update the Android.bp file for radio/1.1/types.hal"