Merge "Remove the "Answers" javadoc barbarism." into dalvik-dev