Android n mr1 preview 2
Fix the build
am: 4707e2b64d

Change-Id: I802695e31c9e0e5243340337220a72820fcc9f28