Merge "Android.mk is going to be deprecated under device/google folder" into main