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

Change-Id: I46ed83dc43e81f533d060040b787d9f3fd5e2731