Merge "don't include liblog to APEXes" am: 2d7b4e7379 am: dc352c09f8

Change-Id: I8d22d7b40cefcc3281969b5adb24b3892a0de5e5