Merge "Fix requests for IBootControl 1.0 when using the 1.1 HAL." am: 80c288d7b3
am: a8d3c3e9d6

Change-Id: I6a2135af989c9a8cb6571759582d57ae019bdb3a