Merge "Remove MHL related code." into lmp-dev