DO NOT MERGE ANYWHERE avbctl: Add the comment and code about ro.boot.slot am: dd941aa4 -s ours am: 5af2d2ea -s ours am: bf2b7765 -s ours Change-Id: Ie0d16f42704eee20e22147ed1e2ceac40c1aad23