Merge "Merge "Android.mk is going to be deprecated under device/google folder" into main am: 4a43047559 am: ce46a74797" into udc-qpr-dev-plus-aosp