Merge "Add make rule for com.squareup.haha"