Merge ef854c914730f8722bd4c32b982f1628162babd5 on remote branch

Change-Id: I707f44520a2e530a92e1b464172872e30b8b3588
tree: 475694d5edf774a0851a6811c100951ace33ef92
  1. dashplayer/
  2. jni/
  3. QCMediaPlayer/
  4. Android.mk