Merge "Add makefile targets for ojluni jaif-annotated source files."