Merge "Easymock: Move to SDK 9"
am: 1c7aea9e23

Change-Id: I32bcc6eced6f12e0f1904789178abdeab04f7c50