Merge "CleanSpec: Clean up /recovery/root/sdcard." am: b69d3b28a5
am: 8994f9ca38

* commit '8994f9ca383fa887e570f54ea78bfeb9fdd39b2e':
  CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.