am 10abe694: am b43cf696: am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev

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