Merge "Revert "Handle "hardware" bootconfig parameter as "androidboot.hardware"""