Should remain 16 to match the API level we are compiling against :(