Fix duplicate dependency warnings

Reorganizes dependencies to be neater as well as resolve duplicate
dependencies that were causing Maven to throw warnings.

Change-Id: Id3bfa285df3beabb95a813509294fd288ee90e6e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Merge "Fix duplicate dependency warnings"