Merge "Have vold inform keymaster that early boot ended" am: 68b9fb10 am: fce0d92c am: bf352873 Change-Id: I3aaebfcca61c92667de114d477cbbcf35d23bcd9