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

Change-Id: I907c7eed27ef67bb8ce170db237763e465ef1c95