Merge "Migrate remaining content from ojluni.jaif to stub files."