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.

Change-Id: Id55c3da7259ba0bb5e62462d5eca721d3716c07f
2 files changed