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