am 73f51a0f: Merge "Fix ANR happens in "com.android.musicfx" at "keyDispatchingTimedOut""

* commit '73f51a0fc5c20ee852367643527b46902f31e9bf':
  Fix ANR happens in "com.android.musicfx" at "keyDispatchingTimedOut"
tree: 5302de0b326ff79a662ebd96f678e6fb80d4ca45
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml