Merge "Pick up on androidboot.hardware kernel cmd option"