Merge "ndk: add STG ABI dumps for internal main" into main