Merge "Move to folder android/support/v4/view to match declared package" into klp-dev