Merge "Don't silently ignore arguments just because we don't take any." into dalvik-dev