snap to klp-dev-plus-aosp b8d3879 with history