Merge "Yak-shaving in support of the exception cleanup." into dalvik-dev