am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev

* commit 'f73f79f1b63c7cb7679264a6c6e4f86fdd78309c':
  Use $OUT_DIR/filelist when OUT_DIR is set