Merge "Remove uncompressed prebuilt dumps before building new ones"
am: 96b977a3d4

Change-Id: Iae8e751c6ea1f9b527a110f186dd0cde4a38abe7