Merge "Clean jack intermediates"
am: cf021094f1

Change-Id: I1808fc66070231bb9340ef5e6d3f488d7c06da09