Merge "Android.mk: remove unnecessary -llog reference"