Merge "Remove comments and code about ro.boot.slot" am: 7dcf076700 am: bf6168fd53
am: 26d09e3b7c

Change-Id: I08a4e0ea745f9471e7aabdc579c423528e60103b