Merge "Fix sdk version for api24-specific libraries"