Merge "Revert "Revert "Add makefile targets for ojluni jaif-annotated source files.""" am: 9a147611 am: 4a4d6444 am: 6bae8a6b Change-Id: If4bea5321a3e44ba0c65763998b0afb2f1870aeb