am aeb31a14: (-s ours) am 81db8d8d: Merge "Maintain a ref to Java objects while print in progress" into klp-dev

* commit 'aeb31a144c474d3c67c0f23bd59126b6575abd4c':