Merge "Fix some < vs <= issues in OatFile"