Merge "Use -Werror in development/vndk"
am: ea75dc7f40

Change-Id: Icf6f26b8bfbd0f4269f9ba257540aaba4229af6a