Merge "code cleanup. unused imports, local variabls and static constans removed from com.android.bluetooth.opp package."