Merge "Refactor android_os_Debug to use androidprocheaps" into main