am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

* commit '0ebbfaedd7fd843229d289baa69fffd33eab2985':
  Add -Wno-unused-parameter to LOCAL_CFLAGS