Merge "Fix py3 error in aosp checker"