Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread