Synchronize with recent trusty based phablet environment

Signed-off-by: Simon Busch <morphis@gravedo.de>