Merge "Remove AOSP warning hook" into udc-dev