Merge "Remove unused Android.mk under device/google/raviole am: bd9ce8035d am: 4bc83922f9" into udc-qpr-dev-plus-aosp