Merge "Add stubs needed to enable javac to compile lambdas"