Merge "Remove oat-target* rules"