Merge \\"hikey: wl18xx-fw: Update wifi firmware\\" am: 73e309eb88
am: 120f5a9923

Change-Id: I3740103272eb6c9df2143a5926dc35d100440606