Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id93fd29ca58e92fcde87904b176f544df5c9a428
tree: 6886c173b933ead6193ba761fba1cfb59e27e395
  1. Android.mk
  2. WrsOMXPlugin.cpp
  3. WrsOMXPlugin.h