Merge changes I513cdbfd,Ia1fa1fd6

* changes:
  Allow mediaextractor to load libraries from apk_data_file
  Allow scanning extractor library directory