Merge 85a5f41ed3ea90623b5eac4519af6550a1b97027 on remote branch

Change-Id: I610e1b8849af1e8b1d59aecce5ea48d24cf77688
tree: b22dc5360da591bc5b4590ccf57700eb9d949b59
  1. datatop/
  2. rmnetctl/
  3. Android.mk
  4. configure.ac
  5. data-oss.pc.in
  6. Makefile.am