Get rid of a superfluous directory level

Get rid of a superfluous directory level 2015-12-02T07:50:31+00:00 Tor Lillqvist tml@collabora.com 2015-12-02T07:34:23+00:00 34cf91de3d0d6455004bacda399351101789d751 Change-Id: I79e065f0c68b149d2ef69f428d31e36e97a6098b

Change-Id: I79e065f0c68b149d2ef69f428d31e36e97a6098b