Merge "FastJNI for android.os.Trace" into mnc-dev