Merge "Add libcore NonNull annotation and core-oj jaif file"