[FIX] Makecat: Remove the raw_input usage and look like inputChoice()

Change-Id: I68465e598c14f5f42443ab5d0db1f66f928bd1e5
Merge "[FIX] Makecat: Remove the raw_input usage and look like inputChoice()"