Fix variable in wifical.sh and remount ro after run

Change-Id: Iabe2a3a51548202287f82fa0a80aef2f29f11cc2
wlan: Don't calibrate just set the MAC address if pds nvs_map exists

Calibration fails with the new modules but we can still set the
Hardware MAC if it exists

Change-Id: Id4ff90bc1f5a5069fe07090b112f66236b491d70
Merge remote-tracking branch 'upstream/cm-10.2' into aosp4.3