Merge "Upstream: decouple patches, Makefile"
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 2 Aug 2016 16:59:00 +0000 (16:59 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 2 Aug 2016 16:59:00 +0000 (16:59 +0000)

Trivial merge