Merge "Selectively delete files from the sdcard" into marshmallow-cts-dev am: 2a2c06e583 am: b69e36ace5 am: 917d65495b am: 64fe747b36 am: 6d20f86e8f
am: d667e4ccc5

* commit 'd667e4ccc5b470e8671b6b5521e3715fba41291c':
  Selectively delete files from the sdcard