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

Change-Id: I103bb872dffc29ed5b381ee2ee5505aec55481d1