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

Change-Id: I48b3f7683eea76a784830f0636071bec416002ae