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

Change-Id: I1ae96529c728cedc270db5315f8042255d8ed5b7