am 5e84ff2c: (-s ours) snap to klp-dev-plus-aosp f57b1e0 with history

* commit '5e84ff2c5c0cd3bb25a9369553bb47eac7a8fd93':