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

* commit '6d20f86e8f2e0d4fb2853d3362113bca984c2aa0':
  Selectively delete files from the sdcard