Clean up libzipfile Android.mk

Switch to using libz instead of libunz as per the note in
external/zlib/Android.mk.

Removed LOCAL_C_INCLUDES which are no longer necessary as zlib
now uses the LOCAL_EXPORT_C_INCLUDE_DIRS mechanism.

Tested compiling the projects that make use of libzipfile using
a clean out dir with both aosp_flounder-userdebug and aosp_arm-eng

make -j16 test_zipfile fastboot adb adbd libSR_Core libsrec_jni

Change-Id: I5fdf34b6c272ae64c406e5b77ab67a5f5e4b5890
Merge "Clean up libzipfile Android.mk"
logcat: use liblog to determine -b all list

- This is done to prevent the administrivia of adjusting
  logcat sources every time a new log id is added.

Change-Id: I0074afb00694c2c00f6c3a66e58c15691146a6c5
Merge "logcat: use liblog to determine -b all list"