Merge changes from topic 'rename_wifi_hal'
am: 73e6598317

Change-Id: I57f299c01135271fa6fbb16d30d3ccf62c415b33