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

Change-Id: I1cb67a35af50f40656bd9215e5d7bba3da54df5f