Merge "Compile CaptivePortalLogin as system_current" am: a5a7af11d7
am: 2891385ae3

Change-Id: Ia87b8a20fed2cc1c09b15a27ed35be2c2a964b61