intermediate changes

Change-Id: I1b164d7fb2f5b4c4b3a4087b8e414935ceed8e8a
merged fixes from home

Change-Id: I196da7c6fec661f33d791487621b5bdd9cfd17df
added log in test launcher

Change-Id: I197dc027cdc96655596d0814cb9ebf0be72de361
Merge branch 'master' of ssh://github.com/rcoscali/frameworks-av

Conflicts:
	media/libstagefright/dash/Android.mk
	media/libstagefright/dash/DashSession.cpp
	media/libstagefright/dash/MPDParser.cpp
	media/libstagefright/include/MPDParser.h

Change-Id: Ia3a0643f65bf49a93bf0ab840d86b1c5ae8bb565