Merge "Use -Werror in dalvik"
am: ba366f86f6

Change-Id: Icc803116707aa65d7e7676b013a1dc47fc23c8be