Merge "Change BootActions to use oem.props."