Fix contact lookup with CLIR prefix

Allow phone numbers which are saved in the phonebook including a
CLIR prefix to be correctly resolved on an incoming call.

For a proper fix, all special cases detailed in calledPartyBCDToString()
should be taken into account; unfortunately that function cannot be
directly used as it currently is.

Change-Id: Ie070e1efc0921bfb0ae0802f500afced5071a652
Revert "SystemUI: add dummy fast charge images for mdpi/hdpi so they won't crash (even though they shouldn't need them atm)"

This reverts commit 784705b74e032818294146a475e265b8205c7946.
Revert "SystemUI: less jumpy brightness slider"

This reverts commit 4378e0966f5137bdb7ec15b16db9e1def04f5026.
Revert "SystemUI: reduce minimum screen brightness when adjusting"

This reverts commit b015dd8c6b0c39d1b817f3dbfae39f6077d8a898.
Revert "SystemUI: improved finger brightness slider"

This reverts commit 17fcfdb45094801e58e9e3b2b3f39224cabaed73.
libstagefright: Add interlaced video support
libstagefright : Fix for clips with Corrupt NAL length

Conflicts:

	media/libstagefright/MPEG4Extractor.cpp
libstagefright: Added aac decoder secure component.

- For secure buffers usecase, aac audio component also needs
  to be secure.
- Added secure aac decoder component to kComponents.

Change-Id: I78a8a7f6d9e1f07040e7fbaeb114cefd8813ff5e
libstagefright: Increase input and output buffer size for sw aac component

- Increase input and output buffer size for sw aac component.
- This is required for playback of httplive streaming scenarios
  where an accessunit contains aac data larger than provided
  input buffer size.

Change-Id: Ic461067cf7b81363e833e912dd0ddbec73188ec1
ibstagefright: Fix for av sync issue with tunnel audio
httplive: Fix in handling seek & update logging

Conflicts:

	media/libstagefright/httplive/LiveSession.cpp
frameworks/base: Fix for video playback failure in browser

- Issue: After camping the Signal to 3G network, open the browser
  and go to www.youtube.com and play any video. Video playback is
  failing after trying to load the video for few seconds. Browser is
  coming back to video's list.

- Cause: At the beginning of playback, as there was a seek request
  pending, seek is done before starting the AudioPlayer. After
  AudioSource seeking, AudioPlayer start is called with OMX in PAUSED
  state, causing assert check fail for OMX state.

- Fix: Call AudioSource start before calling AudioPlayer start, so that
  OMX moves to EXECUTING state.

Change-Id: I4e746bf0b5167d4998fd900bbce3966a2dc1273d
CRs-Fixed: 327929
libstagefright: Set AAC Input buffer size for httplive streaming

-High bitrate URLs for httplive have large aac input frame sizes.
-Set httplive specific input buffer size for AAC format.
-Also,reverting an earlier similar change in sw acc decoder

CRs-Fixed: 330211
Change-Id: I6bc8d95cf71b835cf2db4aec9bd5ae2fb6b2032e

Conflicts:

	media/libstagefright/mpeg2ts/ESQueue.cpp
frameworks/base: Initial commit for tunnel mode encode

Initial commit for tunnel mode encode for AMRNB,
EVRC and QCELP audio formats.
- This change is merge of below commits:
commit 5a98184c78ad899bc318d8b594df6194adda09b7
Author: Haynes Mathew George <hgeorge@codeaurora.org>

libstagefright: Add QCELP/EVRC encode support

commit c67a26f4efa772bf0a45115e9c2941f2cbe957f5
Author: Y Mehta <ymehta@codeaurora.org>

frameworks/base: Add support for audio encoding for
	 amr, qcelp and evrc formats

commit 77ee267b7788a8b533c39736ecb88f8b80448535
Author: Haynes Mathew George <hgeorge@codeaurora.org>

libstagefright: Add support for tunneled audio source

Conflicts:

	media/libmediaplayerservice/Android.mk
	media/libstagefright/AudioSource.cpp
	services/audioflinger/AudioFlinger.cpp

Change-Id: Ibee25349773dfbcd730360c8b3313565d3ad3a85

Conflicts:

	media/libmedia/AudioRecord.cpp
	services/audioflinger/AudioFlinger.cpp
Updates to support newer stagefright functionality changes