Merge "libfilterfw_jni needs libmedia include paths" am: e004a913
am: 3ab9d65

* commit '3ab9d65161ada89fd363b088a2bd916caa8f695d':
  libfilterfw_jni needs libmedia include paths

Change-Id: I0b27f50090754756c391bc840d38ecdb23e978a7