Merge "Option to gnuplot dex layout" am: b4f0076e7f
am: 5538962ddf

Change-Id: Ie3062d0a2342ceeeb227e218ce625a17143a582c