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

Change-Id: I62c43443677521639520daa01d8d587b86b120f2