aceab96289
This is a preparation change to support gjf Eclipse plugin. Change-Id: I5ea3946c87f64f37087952f31e509832822dd60f