[automerger skipped] Fix imports on pi-dev-plus-aosp to fix build
am: 831768fffe  -s ours

Change-Id: I60703ad5bd5beb71eb69bcc5cb6cdc44e3f06965