Revert "shinano: full 23.x merge"

This reverts commit f86fd30577de063e0f765b933ee42109ba3ad174.

Change-Id: I4bbe01246d0787474649627dfc64ed3826e8c24d
Signed-off-by: doc <doc.divxm@gmail.com>