Merge "Emma: Move to SDK 9"
am: c659a45d1b

Change-Id: If200e8f2c07c2333a9acd050be672f573a0c3e32