Merge "Update ojluni.jaif to catch up with AOSP." into pi-dev