Merge "Add safepoint callback for gc" into dalvik-dev