am 353bf5aa: am b5d7011d: am 100a9f07: am 11d21015: am f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
am 353bf5aa: am b5d7011d: am 100a9f07: am 11d21015: am f178d364: Merge "Allow images to be readded to target-files" into lmp-dev

* commit '353bf5aab651afe2883122459da33f67640abe8f':
  Allow images to be readded to target-files

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build