Merge "Update android.host.theme reference images for 400dpi device" into lmp-dev