am cfaf3e46: (-s ours) am 9d579988: (-s ours) am cfdbdd37: (-s ours) am 8de40076: (-s ours) Merge "DO NOT MERGE - Provide a mechanism for adjusting RSCompilerDriver after construction."

* commit 'cfaf3e4641f003bdb304e85979f6a92af008b0d5':