Merge "Add clean targets removing jack and dex files"