Merge "Add capabilities to hostapd.android.rc" am: eb93ab81f4
am: 8bad884695

Change-Id: I5f255ee9a7cc70e1eeb845c0f8b7df9110971036