Merge "Add Android.bp for liblog"