Merge "Remove unnecessary Android.mk in device/google/tangorpro am: 29713d8b37 am: aaad3c04a7" into udc-qpr-dev-plus-aosp