Merge "Fix jack min sdk version for ub branches"