am eeddca8e: (-s ours) snap to klp-dev-plus-aosp b8d3879 with history

* commit 'eeddca8e6a47adcf6d370d0c0d407fb6ec907e8c':