Merge "[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436 am: 97d8fa99d2" into udc-qpr-dev-plus-aosp