Merge "Use -Werror in dalvik" am: ba366f86f6 am: 3e9fc069ce
am: f52e5564fe

Change-Id: I4affb2d5d0bbce955d443571e71a50511159a617