am 8d4562a1: resolved conflicts for merge of 0a694f4c to master

* commit '8d4562a14da90789f39579e1133a707003b60c0c':
  Remove libs from target/product/base.mk.