DO NOT MERGE Fix lmp-preview-dev after bionic merge.

Other projects in lmp-preview-dev are out of date, and it's easier to patch
bionic than to fix all of them.

(cherry picked from commit a856c6f543c71f6778cdb9b39f6049ae8b2c4e53)

Change-Id: Id8fbdf35eb55150579f85b7bdddb5d68d3012218
2 files changed