Merge "Remove unused Android.mk under device/google/redfin am: a9544cd2ed am: 2156e0d5ed" into udc-qpr-dev-plus-aosp