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

Change-Id: Ibb69c61f9d7b48c95ce7a2914d8704d2184ca050