Merge commit '5d817efb66e930af5eb5126529e9a18849279cd0' into remote

Change-Id: I498d9f63ea72c2da985295ba793aba0a967c63be
tree: 68e9b7d173eb3acf65c8f77db110e9edf50daf88
  1. dashplayer/
  2. jni/
  3. QCMediaPlayer/
  4. Android.mk