Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1

Conflicts:
	media/libstagefright/StagefrightMediaScanner.cpp

Change-Id: I898c2beb916ef2122c9d956977cf2a40e5888377