Merge changes I48210ea1,I5f717dd1

* changes:
  clean_header: Run outside of $ANDROID_BUILD_TOP
  clean_header: Fix error handling for no-such-file case