Merge "liblog: Update Android.bp for Android.mk changes" am: d480a99b0c
am: ea29d56873

* commit 'ea29d56873e4dfc692722ac90e79849b9a9699ec':
  liblog: Update Android.bp for Android.mk changes