lpa

Change-Id: Id81af2445c55f82c80ea780883706785d416d050
media: include libmedia_native

Change-Id: Ifbf3c499a675e831f4bf9632a621c0121bad8bd3
Merge branch 'HEAD', remote-tracking branch 'johnny/cm-10.2' into lpa

Conflicts:
	media/libstagefright/AwesomePlayer.cpp

Change-Id: I8cb8cf612b042313f26978547f700688d26f1aa5