Merge "db845c/BoardConfig.mk: fix the value of androidboot.boot_devices" am: 8b88570638 am: 410fa344a4

Change-Id: I8e017121636c4b4ef8c8e4d43432b5e3f348240f