Converting to antlr4 - on development

Change-Id: I6bd803fb07aa6daad1a59150f0de227c532f1d13
Signed-off-by: Marcelo Portilho <marceloport@gmail.com>