Merge "ADV flag is missing LE discoverable flag" into lmp-dev

/******************************************************************************

 *

 *  Copyright (C) 1999-2012 Broadcom Corporation

 *  Copyright (C) 1999-2014 Broadcom Corporation

 *

 *  Licensed under the Apache License, Version 2.0 (the "License");

 *  you may not use this file except in compliance with the License.

                            == BTM_SUCCESS)

        {

            btm_cb.btm_inq_vars.discoverable_mode &= (~BTM_BLE_DISCOVERABLE_MASK);

            btm_cb.btm_inq_vars.discoverable_mode |= (inq_mode & BTM_BLE_CONNECTABLE_MASK);

            btm_cb.btm_inq_vars.discoverable_mode |= (inq_mode & BTM_BLE_DISCOVERABLE_MASK);

        }

    }

    inq_mode &= ~BTM_BLE_DISCOVERABLE_MASK;