Merge "Add compiler callbacks as arg to PrepareRuntimeOptions"
am: 8e7ea37bb0

Change-Id: I35df571f6d7a98f5889d836c284cdb40c75c450b