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

Change-Id: I1096a2c4921c2692fcf7299fc05d3b631aac810b