Merge from jb-mr1-dev-plus-aosp

Change-Id: Ie818c9b62cccc595b1d8538418d5591eb0538722
Merge from AOSP

Change-Id: Ibca2e9f36bbc8867dec0e2e06624456d51b17e73
Add liblog

Bug: 8580410
Change-Id: Iaa05e06e0181bd3e6235f43b43f19a92f685eca9
Merge tag 'android-4.3_r2.1' into jellybean-mr2.1

Android 4.3 release 2.1

Conflicts:
	libstagefrighthw/Android.mk

Change-Id: Iea492ab98d7449b80a1e2b734025f1bbe970e432