Merge "Update Android.bp with x86 rint optimizations"