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

Change-Id: If5a2f4015d7a813302d9f4a60c7bc915eae25de7