Merge "Android.mk flags to install ioshark only on userdebug builds."