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

Change-Id: I8299877589726fe9bdda4eb2aba984600af63d8f