Merge "Let android_stubs depend on jack-default.args"