Merge "Update radio V1_3 and V1_4 Android.bp." am: 5027f2c177
am: a4aadf6859

Change-Id: I156b30b83a7fe1b06d41b19e545f539aa8bb9c60