Merge "Use -Werror in development/vndk"