Merge "Revert "Add makefile targets for ojluni jaif-annotated source files."" am: 9e9732b6 am: 0e4ea294 am: 5e05e393 am: 7438517f Change-Id: I00f0d2678bcbf1264e6628704ce326afbbdf5469