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