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

Change-Id: Ie6d1520782e47a194a4a001407b25fcaa0765425