Merge "Adds /dev/block/by-name/<partition> symlinks" am: 98214c81d1 am: d91d5ecd8b
am: b1b8dac123

Change-Id: I292f78320d8f0685ee2eac49afa2d9b12d91227c