Merge "Reland "Remove comments and code about ro.boot.slot"" am: dea5e081ac am: 9bc2a967cf am: 687cb99e96
am: 99de249cf5

Change-Id: I989b0db7107ae47d5facbb6b5ca3905aed077161